Removed the interfaces and just used the concrete classes.