Camel rework

Few changes to camel spawn