Lamp and category models done. #v-1 fixed #v-2 fixed