Added first steps towards BMEcat 2005 support