Modularize entities