Added possibility to use assembly