Add missing resources
Clean code