Updated structure a bit