Renamed module

Use accessor method for handlers