Moved random handler to different package