More updates to comply to github