This version fix the problem with API V1.1 and also integrate better practices and classes