Add loader and fix object removal