Fix/improve repositories/services