Cleaned up brick interface