Clean-up of many interfaces and added a few helper methods