Add/rename core parsers
Updates