Added interfaces and class layouts