Removed hard coding from handler method realisation