Cleaned up imports
Added support for compound elements to be an enum.