Removed generic type parameter from Brick and "data" attribute