Fixed issues with improper attribute keys and characters (- to _)