Prepared for movebles

Modify XML loader for movables