Added loader stuffs