Improved fixture handling
Added fixtures and models