API cleanup, added FUCTIONS map