Changed setup of loader