Simplifications to implementation