A few changes to follow SRP