Updated structure, fixed bug with common