Improve inlineable classes