Some common types moved to external file