PREVIOUS COMMIT MESSAGE CHANGE: Using interfaces and spring