Added # support