Fixed CollectibleController and CollectibleModel