Returned to original implementation. Now there is a android sdk that uses the beans from this sdk. Consider in the future extract the beans to another package