Add comments, load user from property file