Added more to implementation