Updated supported functions and removed noise