Added base structure and data fixtures