Removed hardcodings and update