Move methods to better places
Fix configuration issues