Logging added
Role selection fixed