Added  Custom classes
Fixed Conflict
using theirs