Common data moved to types.h. Small reafctoring