Added loader and other things