changes towards implementing the psr 7