Optimize imports
Added person data and picture controllers