Added wallable polymorphic functionality