Add few more functions, make core functions naming consistent