Added Supply objects support