Added propety support
Added a goal and ammo