Added some basicarchitecture type stuff