Add some resources and fix loader