#18 Updated meta models