Updated packages and implemented new Builder class without automapper